Increase of riot shield durability #29239
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Increases the total health of riot shields, as well as modifying their damage co-efficient to closer reflect the shield type
github-actions
bot
added
the
Changes: No C#
|
How many hits will it take for a riot shield to break while blocking when attacked by:
|
passive blockingAll testing listed below was done with a human urist and a standard variety "riot shield". these numbers would change slightly depending on the type of riot shield but not super significantly. With various shields they may break later than this, but you will crit at the exact same speed as the damage taken by the player does not change Laser rifle: Shield breaks after 15 shots, urist crits at 15 shots as well (currently breaks at 7, crits at 11) c-20: shield breaks after 13 shots, urist also crits at 13 shots (currently breaks at 6 shots, crits at 10) Energy Sword: shield breaks after 8 swings, urist will crit with 7 swings (currently breaks at 3. crits at 5) active blockingActive blocking would depend much more on the type of shield being used due to the shield taking all the damage rather than 50%. (currently active blocking, a riot shield will break at 4 c-20 shots, 2 esword swings, and 4 laser shots) with the INCORRECT type of shield it would be the flat 100 damage, which equates to 7 c-20 shots, 8 laser shots, or 4 esword swings with the CORRECT type of shield these all double to a flat 200 damage, which equates to 14 c-20 shots, 16 laser shots, or 8 esword swings (this all may seem very high but loosing access to an entire hand not only removes a lot of larger firearms from your use, but complicates reloading significantly. and actively blocking practically guarantees they will hit every shot) |
fixed indentation on line 73 of shields.yml
|
How much of a difference is that to current? Also fix the CL then this should be good to go |
aspiringLich
pushed a commit
to aspiringLich/space-station-14
that referenced
this pull request
Jul 21, 2024
Ilya246
pushed a commit
to Ilya246/space-station-14
that referenced
this pull request
Oct 10, 2024
* Fix double label on chem jugs (space-wizards#29137) * Automatic changelog update * Fix DresserFilled storagefill rarely causing an error (space-wizards#29135) Add ClothingUniformJumpskirtColorPink to an OrGroup * Fix female reptilians not having gasp sounds (space-wizards#29143) inital * clean up weather systems (space-wizards#28792) * clean up weather systems * Update WeatherComponent.cs * Update SharedWeatherSystem.cs * some fix * Update SharedWeatherSystem.cs * Update WeatherComponent.cs * Update WeatherComponent.cs * revert autoPause * Update SharedWeatherSystem.cs * Implement vital chef's hat functionality (space-wizards#25950) * Implement crucial chef's hat functionality * Unified stopping code and added events. * Added documentation to events * Rerun tests * Made review changes, and fixed potential desync bug. * Update whitelist * Automatic changelog update * Add cvar to disable round end pvs overrides (space-wizards#29151) * Update submodule to 226.1.0 (space-wizards#29159) * Fix conveyor mispredicts (space-wizards#28157) * Fix conveyor mispredicts Instead of tracking active conveyors we instead track the conveyed entities. This also handles things like stacking conveyors more gracely. * Fix ActiveConveyor * Fix lerping * Automatic changelog update * Replace StationRandomTransform (space-wizards#29149) * Revert "Rotate and Offset station CCVar nuke (space-wizards#26175)" This reverts commit 44b20f6. # Conflicts: # Content.Server/Station/Systems/StationSystem.cs # Resources/Prototypes/Maps/europa.yml * Fix * Review * Add warning cones to engivend (space-wizards#29085) Add cones to engivend * Automatic changelog update * arachnid inventory layout fix (space-wizards#29165) arachnid inventory layout fixC * Automatic changelog update * Turn interaction related attempt events into structs (space-wizards#29168) * Turn InteractionAttemptEvent into a struct event * readonly * GettingInteractedWithAttemptEvent * ConsciousAttemptEvent * Add the most anticipated gun in the game. Foam Force. (space-wizards#29103) * Foam Force * make it available somewhere * add clumsyproof and nuke dev item * reorganize * oopsy files * Strap! * woopsie layering * fix grammar to rerun tests for rogue unrelated test fail. * cleanup * I eepy layer forgetti spaghetti * For real last necessary commit * Oops I broke the law! feexed * Decided to just change it to the same source as the poster source in our repo for consistency. * Automatic changelog update * Fix material storage going BRRT (space-wizards#29167) If the volume hits 0 we just remove it. * Automatic changelog update * Fix air alarms (space-wizards#29172) Broken by space-wizards#28272 * Automatic changelog update * Hidden loadout groups (space-wizards#29170) * loadout hiding * department of redundancy department * Upgrade rsi-diff's changed files action | Make it only return rsi and png changes (space-wizards#29185) It was brought up to me in space-wizards#29179 (comment) (and from a dm from them) that space bars can cause issues with the rsi bot. Upon investigation its case we use "space-delimited" on the "get changes files" check. Which returns ALL changed files. Even if the change has nothing to do with png's or rsi's (example a downstream merging upstream) * unhardcode thief MaxSelectedSets (space-wizards#29175) * unhardcode thief MaxSelectedSets * we do a little copy paste*
Ilya246
pushed a commit
to Ilya246/space-station-14
that referenced
this pull request
Oct 10, 2024
* Fix double label on chem jugs (space-wizards#29137) * Automatic changelog update * Fix DresserFilled storagefill rarely causing an error (space-wizards#29135) Add ClothingUniformJumpskirtColorPink to an OrGroup * Fix female reptilians not having gasp sounds (space-wizards#29143) inital * clean up weather systems (space-wizards#28792) * clean up weather systems * Update WeatherComponent.cs * Update SharedWeatherSystem.cs * some fix * Update SharedWeatherSystem.cs * Update WeatherComponent.cs * Update WeatherComponent.cs * revert autoPause * Update SharedWeatherSystem.cs * Implement vital chef's hat functionality (space-wizards#25950) * Implement crucial chef's hat functionality * Unified stopping code and added events. * Added documentation to events * Rerun tests * Made review changes, and fixed potential desync bug. * Update whitelist * Automatic changelog update * Add cvar to disable round end pvs overrides (space-wizards#29151) * Update submodule to 226.1.0 (space-wizards#29159) * Fix conveyor mispredicts (space-wizards#28157) * Fix conveyor mispredicts Instead of tracking active conveyors we instead track the conveyed entities. This also handles things like stacking conveyors more gracely. * Fix ActiveConveyor * Fix lerping * Automatic changelog update * Replace StationRandomTransform (space-wizards#29149) * Revert "Rotate and Offset station CCVar nuke (space-wizards#26175)" This reverts commit 44b20f6. # Conflicts: # Content.Server/Station/Systems/StationSystem.cs # Resources/Prototypes/Maps/europa.yml * Fix * Review * Add warning cones to engivend (space-wizards#29085) Add cones to engivend * Automatic changelog update * arachnid inventory layout fix (space-wizards#29165) arachnid inventory layout fixC * Automatic changelog update * Turn interaction related attempt events into structs (space-wizards#29168) * Turn InteractionAttemptEvent into a struct event * readonly * GettingInteractedWithAttemptEvent * ConsciousAttemptEvent * Add the most anticipated gun in the game. Foam Force. (space-wizards#29103) * Foam Force * make it available somewhere * add clumsyproof and nuke dev item * reorganize * oopsy files * Strap! * woopsie layering * fix grammar to rerun tests for rogue unrelated test fail. * cleanup * I eepy layer forgetti spaghetti * For real last necessary commit * Oops I broke the law! feexed * Decided to just change it to the same source as the poster source in our repo for consistency. * Automatic changelog update * Fix material storage going BRRT (space-wizards#29167) If the volume hits 0 we just remove it. * Automatic changelog update * Fix air alarms (space-wizards#29172) Broken by space-wizards#28272 * Automatic changelog update * Hidden loadout groups (space-wizards#29170) * loadout hiding * department of redundancy department * Upgrade rsi-diff's changed files action | Make it only return rsi and png changes (space-wizards#29185) It was brought up to me in space-wizards#29179 (comment) (and from a dm from them) that space bars can cause issues with the rsi bot. Upon investigation its case we use "space-delimited" on the "get changes files" check. Which returns ALL changed files. Even if the change has nothing to do with png's or rsi's (example a downstream merging upstream) * unhardcode thief MaxSelectedSets (space-wizards#29175) * unhardcode thief MaxSelectedSets * we do a little copy paste
Baa14453
pushed a commit
to Baa14453/space-station-14
that referenced
this pull request
Oct 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Increases the total health of riot shields, as well as modifying their damage co-efficient to closer reflect the shield type
About the PR
This PR aims to make security use riot shields more often, while making the riot shield + pistol combo more viable in combat than its meager state currently. right now security never really uses them as the tradeoff of a bulky, hard to carry shield for minimal protection is rough!The recent change to make most guns require wielding to accurately fire is already a fantastic change for gunplay. I believe increasing the usefulness of shields would also aid in making gunplay feel more varied
I also would LOVE to see security use riot shields to block hallways, section off areas, and use the anchoring system more which is why I increased the active block resist on all the riot shields
Why / Balance
I changed this in the hopes of not only increasing the use of riot shields, but it might also decrease the need to arm security from armory if they have access to an easier alternative on blue alert. But as stated above it also increases the variety of viable "loudouts" for combat using already existing items and abilitiesI considered possibly making each shield weak to a damage type as well (I.E the standard riot shield would take 150-200% heat damage or something) to try and maintain balance. If that needs to be done it certainly could be
Technical details
in Shields.yml i increased the damage threshold's by 60 damage, making sure to keep the higher one that doesnt spawn materials so that weird bugs don't occur upon overkill (nukes)I also modified the 3 riot shields damage co-efficients, making them uniform across the board for their respective damage types
Media
I believe this PR does not require media as it is entirely numerical
Changelog
🆑